Thanks!

Not a problem at all. Would welcome any feedback (good or bad), it can only help me to get better :-)

asserts changed in new pester, particularly around piping...
I really like this PR.

And I would rebase fixup your commits so its a clean bisectable history. With all the outstanding PRs we need to make sure if we introduce a bug, we can use git bisect and git blame successfully going forward.

Hey,

More than happy to do what ever is required, but can I ask for a bit of hand holding for this, still relatively new to git, and don't want to do anything wrong :-)

Are you simply looking for me to rebase so that there is a single commit for the PR? If so, could you walk me through the steps?

Thanks, much appreciated! My experience with git to date has been as a single developer working in one branch and one remote, so I haven't yet ventured into the sort of details that you guys are now facing.

Also, is there something that I need to change around the asserts? If so, happy to do this as well.

Thanks

Gary

C:\gitrepos\chocolatey [branch]> git remote -v
origin [email protected]:rismoney/chocolatey.git (fetch)
origin [email protected]:rismoney/chocolatey.git (push)
upstream [email protected]:chocolatey/chocolatey.git (fetch)
upstream [email protected]:chocolatey/chocolatey.git (push)

git checkout master
git fetch upstream
git rebase upstream/master

then
git checkout yourbranch
git fetch upstream
git rebase upstream/master - this puts your changes on top of the current HEAD

then
git rebase -i upstream/master
editor should be launched

you should see a list of all your commits, with the word pick in front.
starting with the second commit change the first word from pick to fixup
repeat for all subsequent comits
close editor with save

then
git commit --amend to fixup the single commit message

then
git push -f origin

you will then have a single commit that looks like you did it perfectly the 1st time.

Sounds easy :P

I will let you know how i get on.

Thanks for all your help!

Gary

Sent from my Windows Phone

From: Rich Siegelmailto:[email protected]
Sent: ‎19/‎04/‎2013 21:14
To: chocolatey/chocolateymailto:[email protected]
Cc: Gary Ewan Parkmailto:[email protected]
Subject: Re: [chocolatey] Issue 235 - Created new Helper Function to create generic shortcut (#238)

C:\gitrepos\chocolatey [branch]> git remote -v
origin [email protected]:rismoney/chocolatey.git (fetch)
origin [email protected]:rismoney/chocolatey.git (push)
upstream [email protected]:chocolatey/chocolatey.git (fetch)
upstream [email protected]:chocolatey/chocolatey.git (push)

git checkout master
git fetch upstream
git rebase upstream/master

then
git checkout yourbranch
git fetch upstream
git rebase upstream/master - this puts your changes on top of the current HEAD

then
git rebase -i upstream/master
editor should be launched

you should see a list of all your commits, with the word pick in front.
starting with the second commit change the first word from pick to fixup
repeat for all subsequent comits
close editor with save

then
git commit --amend to fixup the single commit message

then
git push -f origin

you will then have a single commit that looks like you did it perfectly the 1st time.

Reply to this email directly or view it on GitHub:
#238 (comment)

Ok, I think I have done everything that you suggested, but I am now also a little confused. How did it get into this pull request already? I expected the last command that I ran, i.e:

git push -f origin

To put the rewritten commits into my forked repo, and from there I would have to update the pull request, but this seems to have happened automagically. What gives? Or what am I missing?

Thanks for all the help by the way, it really helped! Would have never figured that out on my own! :-)

Gary

Once you push to a remote that is part of a pull request, it updates the PR
automagically. That's why we always want PRs in branches, so you don't
accidentally include something you don't want in the PR.

On Saturday, April 20, 2013, Gary Ewan Park wrote:

Ok, I think I have done everything that you suggested, but I am now also a
little confused. How did it get into this pull request already? I expected
the last command that I ran, i.e:

git push -f origin

To put the rewritten commits into my forked repo, and from there I would
have to update the pull request, but this seems to have happened
automagically. What gives? Or what am I missing?

Thanks for all the help by the way, it really helped! Would have never
figured that out on my own! :-)

Gary

—
Reply to this email directly or view it on GitHubhttps://github.com//pull/238#issuecomment-16705844
.

Rob
"Be passionate in all you do"

http://devlicio.us/blogs/rob_reynolds
http://ferventcoder.com
http://twitter.com/ferventcoder

Gotcha, that makes sense. Have to take my hat off to Git and Github, they really do provide a great system. Once you get past the learning curve that is :-)

It really is awesome. I hope I can get a lot of posh people on it at the summit this week. I Cant stand codeplex.

Gep13 said:

I believe that this may also solve Issue 218 as well:
#218

This adds a shortcut to the desktop which does not make the application appear in the Windows 7 or Windows 8 start menu. It is not indexed for searching.

This #228 allows pinning to start. I use it in my own installers, but this should really be included in Chocolatey imo.

I think it'd be best to encourage packagers to do pin to start anything that is not a command line tool as discussed here: #305

Due to me deleting the original branch that this PR was submitted on, I had to recreate it, as a result, the linking is broken. However, I have recreated the PR, and pulled it in here:

201ad95